Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 22 Jun 2010 13:27:02 +0000 (13:27 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 22 Jun 2010 13:27:02 +0000 (13:27 +0000)
commitcdf5e19d898e3055d1fbb69a2b382afd1b4800f4
treefefe73e738a45bf4deeaf677acb80525685865b9
parente5ba55294e8cab4f3d951703f000d2d80a83474e
parentc659871bc7534bfba18bdb75a3652e2d4e2498e6
Merge from mainline.